More efficient version of the last fix (better regex pattern)
Fixing the fix