Reordering bugfix