Fixed, this time, really