@@ -61,12 +61,13 @@
 	add	eax, offset _GLOBAL_OFFSET_TABLE_
 	lea	eax, [eax+\not_found@GOTOFF]
 	jmp	eax
 
 .Ltagged_pointer_\name:
+	and	dl, 0xF
+	shr	dl, 1
 	movzx	edx, dl
-	shr	edx, 1
 
 	call	get_eip
 	add	eax, offset _GLOBAL_OFFSET_TABLE_
 
 	lea	eax, [eax+objc_tagged_pointer_classes@GOTOFF]