Update for N3657 and issue 2010