Fix for SDK-1501, Paging issue