This should fix issue #3