fixed issue #49