Make selector less finicky