Add Fix for keyType