fixed issue #57
fixed issue #57