Same as my last commit but with one less bug