Fix for option group check in custom fields