fixing troubles