Work around 4x todo generating strangeness