Fix to analysis callbacks