Fix same issue as in 8e9e78e for func calls.