Fix first run error