fixed issue #16 (partly)