Fixed Goalie Issues