Revert commit from issue #58, fix issue #63