Hardware Keys fix