#36 fix on categories