Fix issue with arcade mode