Temporary fix for 6.0 but still some othe failures...