Cover some missed class detection cases (Fixes #1)