bugfix in custom fields