fixed regex expressio to be a bit looser