better non-block regex based on original one