fixed double removing