Do the last fix properly