Fix PR2028