Fixed circular reference and spec