fixed #265 @ Holy Paladin !
again fix for #267