Commit prior to changing keys layout
Bug fixed, but breaks binary compatibility with older versions