FIX recent changes bug on first run