Fix category bug
Continue work