#2269117 patch applied, fixed