Fix my own fix