Some servers are fussy. Fix #352