Kikke's bug and workaround added. Thanks