Had to revert back to fix a game crash bug