The problem is now fixed, no wrapper needed.
Add some extra logging to time limit progress.