fixes tique wash issue
merge confict