fixed issue #394