regex fixed as well