fix I-114531

also fixes I-112159