Fixes the same problem as the previous version, except it also works with the 'exit' trigger instead of just the 'quit' trigger.