Fix bug ZK-1602

already fixed in 6.5.1, no need to merge into master branch