ENTESB-1460: Revised last fix with a working fix confirmed working by other people in need for it.