fix method name and callback vars