bugges fixed