Fix for clean_until_done