Resolve the Archived issue