fixed issue #52
fixed issue #54