Fixes problems with too long field keys