Fix the untested mess that was the last commit