Keep on hacking towards fixing PR # 191055