Minor fix to API, callback last