Fixed schema fallback