Issue IKTRE-87 by tuj: Attempt to fix bug