fixes bug 814020 - One management table to rule them all