fix adaptive behaviour