Fix functioncall match going nutso