fixed copy handler cleanup.