Added a TODO, see #329