the first attempt (8.5 based) as minimalist fix made in <a