Resolved issue #80