Replace strict to safe mode