fixed issue #54
fixed issue #55