Fix for new Iron/Hyper etc.