Resolved issue #9