Resolved issue #49