Fixed video selection (again)