Attempt to fix closures issue with makeDone()