Fix done & active