Actually fix issue #2