Fix #5092
Fallback to base per #5092