Fixing issue with first_run