Fixed cleanup issue.