Resolved issue #116