Fix: First Party Category issue; #345