Got rid of cyclic getter