Bug fix: trap was recursive.