One more regex adjustment (efficiency)