Fixed, finally