Making fit more robust