Merge "Fix for incorrect variable declaration."