Fixed categories. REgression since last commit