Initial selection bug fixed