Fix mysterious decryption bug caused by clean up