fixed issue #402