Fixed cat issues