SCREEN-48 fixed