fix for D3277 and D3278