Trap ordering issues fixed!