Over-eager fallback fixed #132