[WOTGM-738] Fix after review.