Fix callback params