Fix bug on HD*Keys