Fixing ProjectImpl