Resolved issue #29