[WOTGM-651] Fix after review.