[bug 1037900] Fix for cc2c70a