Fixed func call wrapping