One big-ass bug fix (literally, it's the most gigantic thing...)