Fixed invoking callbacks