Fixed issue with wrongly formatted field names