Resolved #83, properly fall back