Is it possible to write a better #FIXME / #TODO here? I'm not sure what's supposed to be fixed or updated after this PR?