Manual goalie switching needs fixed

It auto dives poke check when pressing L1 + X (PS5) to  switch to manual goalie when the opponent is on a breakaway. Can't manual goalie because he gets all scrambled. Needs to go back to last year when manual goalie switching or just make the diving poke check have a delay when switching.