Fix bug with start up