Fix circular dependency error