fixed clean up issue