Issue IKTRE-87 by tuj: Possible fix