Special chars in portfolio pagination links with WPML

This is not a presale question. I just wanted to let you know, that if you use WPML Plugin and enfold, then at portfolio pagination there is html special char “#038;” before the “lang=en” in links instead “&”.
I fixed it for me in “function-set-avia-frontend.php” with str_replace by this code below. But maybe you have a better solution, as I am just hobby php programmer :)

// @since 4.8.4 fix possible XSS vulnerabilities in query string
$url = str_replace(“#038;”, “&”, $url);
$url = esc_url( $url );

return $url;