updating regexp to avoid erros