Better fix of with_project