fixed issue #17 (partly)