multipart key bug fix