Change to simple getter from lazy getter.