Prevented the goal delay bug