Improved handling of completed assignments