Fix disarming a trap when key is used (Fixes #1556)