Corrected a bug on the fallback mechanism.