Bug/category fix