Thanks graff!

I've replaced my regex with yours - it makes so much sense :)

And thanks to everyone for commenting!</P