[WOTGM-947] Hotfix after review.