fixed issue #32
fixed issue #32