Add Uberi's workaround for the schem limit