Resolved issue #6