Improve robustness when adding done class