Minor tweak, left a @todo