[WOTGM-947] Fix after review.