Fix category and section