fixing major issue