Another change to avoid double comparison problems.