Fix '$${' handling