fixes in fun structure