fixed major issue