Fix bug on start