This code does not address the temporary table fix.  Can you remove it?