Fixed navigation property and concurrency check