Fix calls to chopForward