Emergency trap saving fix.