Fixes Bug_1068683