Update TODO with ref. to issue