Changed regex a little