fix for D3284, D3285