[#912] Circular import fix