fixed missing callbacks