Fixed variable name collision
Finishing 1.4.5 hotfix branch