changed regex order