Resolved issue #27