Fix to HP Warning