Fixed first run code.