Fixed a major issue