Resolved issue #92