revert fix of #15 and now fix it really

fixed issue #15