[PS4] Proper race with the new props (Feedback Needed)