Resolved issue #7