Fixing regex bug reported by twitter user @avlidienbrunn