Handle local variables propertly