Fix HWkeys #1