Circular import issue in F37