Fixed first run nil issue