Fixed issue #77