fixed issue #227
fixed issue #227