Naive fix for double "done"