Fix circular dependency in controls