Improve complete done behavior