Yes, this 2nd condition should be removed.