Fix iss #50

Fix issue #50