fixing bugses