switching to a straight function call instead of using call_user_func() to help clean up the stack trace
fixing path issue