I've attached a patch addressing this issue. May I push it?