fixed issue #29
fixed issue #29