fixed error where squad could be empty