Did we mean to change this to a lazy val?