Fix settings not saving between calls