Got rid of circular reference