Resolved issue #82