Added TODO for #346