Resolved issue #8