Fix for bug with no custom fields present.