Make fallbacks work for production as well