fixing the reorganization