fixed issue #239