ERT-652: Minor change after review