Hardware key fix