fixed the bugs caused by todays reorg