fix callbacks again