Added a skip_cleanup param to see if that's the problem.