Fix callback yet again