Issue #15536, fixes suggested from @janjongboom