Fixed bug in CategoryMapper