Attempt to do what last commit didn't