JBIDE-17876: Original categories are now preserved