Fixed stupid regexp inducted errors