fix WHO support