fix for #15585

fix #15585 
Tested on ubuntu 12.04