fixed collection callbacks