Same fix but unhacked
Another test and that's good