fix for IGIRTC-156/GGUS-95709