FIX: forgot to add check for callacbk