Fixed issue with regular expressions not working properly.