Settings saving is fixed