add TODO, see #121 / d760fb012f51943d75c993a8b80ab015ec2ebae5