Maybe fix issue #2