fixed circular reference really