fixed issue #309