Fix issue #43 2)

Fix issue #43 2)