Add fix for Gel Schemas (#4483)