FIX inital selection not being set