Fix settings managment