EVERREST-72 bugfix