Fixing the issue with agreement type.