[bug 883994] Fixed variable name collision