Fix for -Wshadow warning