Fixed the categories chaos.