fix for fallback controller