Resolved issue #69