Minor edit to ensure that settings get saved