Fixing the actual classification id catches