[#1735] fix to 6f6df94