fixup! support within function in the where clause