Unknown fields fix