Fixing callback options