Change regex format
Bug fix