Fixed bug with the start selection