Fixing bugs caused by reorganization