Adding step to fix circular dependency