Fixed missing callbacks