Added fallback for callbacks