fixed some callbacks