fixing stufs