Small update for the getOrElse case