Refactor to always check for this.done presence before calling it