fixed bugges