Reordering stuff for potential fix.