[WOTGM-651] Additional fix after review.