Fix issue with first run