Commit 4

Hopefully this fixes the new bug.