Fix for temporary keys.  -Jon I