Fixes #80, fix the category order