Fix problem with gdt's expression parser