Add Jan Axelsons Hid fix