Made regex more accurate again