should fix issue #2