Fixed pers bugs