INT-3341: fix as Gary's comments
fix as Gary's comments