Fix on adaptive