fixed issue #193
fixed issue #199