Bug Fix in Settings Window