#367 Fixed condition of fallback