Fix circular ref