Fix PR2029