This should fix issue #10