Minor fix, fallback system works