Avoid duplicate calls to done
1.2.1