Branch to work on fallback bug..
Fix fallback logic.
Next release is 0.9.1t.