Resolved issue #59