fixes for D3216, D3219, D3213, D3214, D3215, D3217, D3218, D3218, D3220