Fix issue wtih "." in regexp