fixed issue #59 and issue #60