Fixed issue #43
Fixed Issue #43