fixed some circular references