Fix func call regex handling