Fixed first run bug