Workflow paging fix