Replace remember by enforce