Fixed WHO handling.