diff --git a/VDS/Extensions/UITapGestureRecognizer.swift b/VDS/Extensions/UITapGestureRecognizer.swift
index cf4121ba..02dc14a6 100644
--- a/VDS/Extensions/UITapGestureRecognizer.swift
+++ b/VDS/Extensions/UITapGestureRecognizer.swift
@@ -11,37 +11,19 @@ import UIKit
 extension UITapGestureRecognizer {
     
     public func didTapAttributedTextInLabel(_ label: UILabel, inRange targetRange: NSRange) -> Bool {
-                
-        guard let abstractContainer = label.abstractTextContainer() else { return false }
-        let textContainer = abstractContainer.0
-        let layoutManager = abstractContainer.1
         
-        let tapLocation = location(in: label)
-        let indexOfGlyph = layoutManager.glyphIndex(for: tapLocation, in: textContainer)
-        let intrinsicWidth = label.intrinsicContentSize.width
+        guard let attributedText = label.attributedText else { return false }
         
-        // Assert that tapped occured within acceptable bounds based on alignment.
-        switch label.textAlignment {
-        case .right:
-            if tapLocation.x < label.bounds.width - intrinsicWidth {
-                return false
-            }
-        case .center:
-            let halfBounds = label.bounds.width / 2
-            let halfIntrinsicWidth = intrinsicWidth / 2
-            
-            if tapLocation.x > halfBounds + halfIntrinsicWidth {
-                return false
-            } else if tapLocation.x < halfBounds - halfIntrinsicWidth {
-                return false
-            }
-        default: // Left align
-            if tapLocation.x > intrinsicWidth {
-                return false
-            }
-        }
-        
-        // Affirms that the tap occured in the desired rect of provided by the target range.
-        return layoutManager.boundingRect(forGlyphRange: targetRange, in: textContainer).contains(tapLocation) && NSLocationInRange(indexOfGlyph, targetRange)
+        let layoutManager = NSLayoutManager()
+        let textContainer = NSTextContainer(size: label.bounds.size)
+        let textStorage = NSTextStorage(attributedString: attributedText)
+        layoutManager.addTextContainer(textContainer)
+        textStorage.addLayoutManager(layoutManager)
+
+        let location = location(in: label)
+        let characterIndex = layoutManager.characterIndex(for: location, in: textContainer, fractionOfDistanceBetweenInsertionPoints: nil)
+
+        guard let _ = attributedText.attribute(NSAttributedString.Key.action, at: characterIndex, effectiveRange: nil) as? String, characterIndex < attributedText.length else { return false }
+        return true
     }
 }