Fix by Mitz Pettel, reviewed by Hyatt.