Remove component fix
Multi counter fix