Trap now seems to work