categories first fix