Removed TODO item because has been non-issue so far.