Revise the routine for holding settings (1.8.7 RC5)