Fixed escaped underscores