fix for null extra callbacks issue