Make encrypt and decryt more consistent.