1.32 Key Export bug fix