Fix index on callbacks