Add checking for 'Done' method