Moved TODO note to #50