EVERREST-58: fix bug