Small change to fix state on assigned selected