This should fix issue #2