Fixed issue #43