Fix issue #75
Fix issue #75(2)