added fast_fail support