Fixed support for 16-character keys