huayra-hotfix