Improvement to previous paging fix (OMS-518)