add_to_cleanup fix