fix callbacks