Applying John's fix for saving global settings