Fixed the disappearing fallback bug (see #11)