fixed issue #104
fixed issue #103