Fixes bug bug/1153842