Fix a bug on first load