Client HXML fix