Fix fallback support. Fixes issue #12

Merge?