should fix issue #50