Fix callback method arguments