diff --git a/src/DataFrame/Functions.hs b/src/DataFrame/Functions.hs
index 31c9706b..60eeb0ac 100644
--- a/src/DataFrame/Functions.hs
+++ b/src/DataFrame/Functions.hs
@@ -280,7 +280,7 @@ recodeWithDefault d mapping =
         (Maybe.fromMaybe d . (`lookup` mapping))
 
 firstOrNothing :: (Columnable a) => Expr [a] -> Expr (Maybe a)
-firstOrNothing = lift Maybe.listToMaybe
+firstOrNothing = UnaryOp "firstOrNothing" Maybe.listToMaybe
 
 lastOrNothing :: (Columnable a) => Expr [a] -> Expr (Maybe a)
 lastOrNothing = lift (Maybe.listToMaybe . reverse)