Resolved issue #37