fixed issue #424