fixed issue #384