Make sink more robust