Small change in regex.. not sure if better
much better...