The last fix, fixed for real