Make things work on first run