Improved fallback mechanism

revision 2