Fixed ugly circular import