the almost 6am commit that fixes everything