Refactor fallback
Fix #series