Added workaround for fields name