CLUB-644: fix