Fixed shadow variables warning