Fix Issue #60 and Issue #62