Event trapping fixed