Adding #ifdef and a compilation flag to remove failsafe functionnality