Fix for #15585 

Teste on ubuntu 14.04