added more fallbacks