Revert "Revert "fix a mistake get hw keys working""

This reverts commit c73db596da509907c89ac8450fce0a6fbb035dee.