diff --git a/yesod-form/Yesod/Form/Fields.hs b/yesod-form/Yesod/Form/Fields.hs
index c8d0e368..b8109dfb 100644
--- a/yesod-form/Yesod/Form/Fields.hs
+++ b/yesod-form/Yesod/Form/Fields.hs
@@ -403,12 +403,11 @@ checkboxesField ioptlist = (multiSelectField ioptlist)
             opts <- fmap olOptions $ handlerToWidget ioptlist
             let optselected (Left _) _ = False
                 optselected (Right vals) opt = (optionInternalValue opt) `elem` vals
-            let selOpts = map (id &&& (optselected val)) opts
             [whamlet|
                 <span ##{theId}>
-                    $forall (opt, optsel) <- selOpts
+                    $forall opt <- opts
                         <label>
-                            <input type=checkbox name=#{name} value=#{optionExternalValue opt} *{attrs} :optsel:checked>
+                            <input type=checkbox name=#{name} value=#{optionExternalValue opt} *{attrs} :optselected val opt:checked>
                             #{optionDisplay opt}
                 |]
     }