couldn't we keep the result of the fork, use one branch on the addTrap?