[WIP] Category fix.