Fix type and callback