Fix start point selector, and fix bug