Correction of last commit for 1.6.4
A few things were different back then