One more fix to the selection