#268 regex fixed