Fixed annoying bug on first launch