fixed two stuff