Fixed issue #77

Fixed issue #77