Fix issue #43