Fix proposed by Mitz Pettel, reviewed by Darin.