Legacy fallback

Helps #706