Fix bugs after previos peoples