fixed issue #400