Fixed the naming bug
Defensive Copying FTW
Merge branch '1.6.4'