Fixed issue #62