Adding Rm -i safeguard