Resolved issue #53