Fix on last change