Added in better support for handling fallbacks. Fixes #2.