applied Jukkas prev/next patch with XK_{h,l}