try to fix circular dependency