Escape special characters for class suffix - #665