Fixing the department issue