Fixed problems with fallback