Fixed the mess that was category