Fix circular dependency issue