Fixing callback arguments