Adding safety conditions