Handle temp var properly now