fixed issue #46