Fixbug when no Done object