Finally fix first run