Fix first run