Added fallback override