Fix and Re-enable AtD plugin