Resolved issue #3