issue #36 reversed fallback logic