More hax 1.8 fix