Mac's Racing Patch                                                        (#3524) * (**)