CODE: Trap bugfix