ADEN-845 Say fix again (and small TODO)