Resolved issue #24