Partially fix cat duplication problem