Added todo note for #799