Resolved issue #65