When I get a few minutes this weekend I'll pull this change out and fix it separately.