Tick, cleaning and fix