diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 9381e0829..42c21d62a 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -161,6 +161,7 @@ colRating = sortable (Just "rating") (i18nCell MsgRating) $ \DBRow{ dbrOutput=(E
       mkRoute = do
         cid <- encrypt subId
         return $ CSubmissionR tid ssh csh sheetName cid CorrectionR
+      mTuple mA mB = (,) <$> mA <*> mB -- Hamlet does not support enough haskell-syntax for this
   in mconcat
      [ anchorCellM mkRoute $(widgetFile "widgets/rating/rating")
      , writerCell $ do
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 7faa02e29..cc5bc7718 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -199,11 +199,12 @@ getSheetListR tid ssh csh = do
             let stats = sheetTypeSum sheetType in -- for statistics over all shown rows
             case mbSub of
               Nothing -> cellTell mempty $ stats Nothing
-              (Just (Entity sid Submission{..})) ->
+              (Just (Entity sid sub@Submission{..})) ->
                 let mkCid = encrypt sid
                     mkRoute = do
                       cid' <- mkCid
                       return $ CSubmissionR tid ssh csh sheetName cid' CorrectionR
+                    mTuple mA mB = (,) <$> mA <*> mB -- Hamlet does not support enough haskell-syntax for this
                     acell = anchorCellM mkRoute $(widgetFile "widgets/rating/rating")
                 in cellTell acell $ stats submissionRatingPoints
 
diff --git a/templates/widgets/rating/rating.hamlet b/templates/widgets/rating/rating.hamlet
index 5c42595e2..a2fb74fe0 100644
--- a/templates/widgets/rating/rating.hamlet
+++ b/templates/widgets/rating/rating.hamlet
@@ -1,8 +1,10 @@
 $# Display Rating, expects
+$#  sub :: Submission
+$#  submissionRatingDone :: Submission -> Bool
 $#  submissionRatingPoints :: Maybe points
 
-$maybe points <- submissionRatingPoints
-  $maybe grading <- preview _grading sheetType
+$if submissionRatingDone sub
+  $maybe (grading, points) <- mTuple (preview _grading sheetType) submissionRatingPoints
     $case grading
       $of Points{..}
         _{MsgAchievedOf points maxPoints}