Resolved issue #5