Fix the ordering of the starting context for workunits