Fix rendering
Regex issues