Fix issue #43 1)

Fix issue #43 1)