Eliminated "my variables mask" warning