Trying to avoid double-planning errors