Bz/1044155

This fixes bz 1044155.