Fixed escaping underscores