diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py
index 2c649a6b..7f4d23c0 100644
--- a/rowers/plannedsessions.py
+++ b/rowers/plannedsessions.py
@@ -1385,19 +1385,22 @@ def default_class(r,w,race):
                 adaptiveclass=adaptiveclass,
                 boattype=boattype,
                 ).order_by(
-                    "agemax","-agemin","boattype","sex","weightcategory"
+                    "agemax","-agemin","boattype","sex","weightcategory",
+                    "referencespeed"
                     )
             if standards.count()==0:
                 standards = CourseStandard.objects.filter(
                     agemin__lt=age,agemax__gt=age,
                     boattype=boattype
                     ).order_by(
-                    "agemax","-agemin","boattype","sex")
+                    "agemax","-agemin","boattype","sex",
+                    "weightcategory","referencespeed")
                 if standards.count()==0:
                     standards = CourseStandard.objects.filter(
                         agemin__lt=age,agemax__gt=age
                         ).order_by(
-                            "agemax","-agemin","boattype","sex")
+                            "agemax","-agemin","boattype","sex",
+                            "weightcategory","referencespeed")
 
             if standards.count()==0:
                 # boolean, boattype, boatclass, adaptiveclass, weightclass, sex, coursestandard,