Fix for Great Race