Resolved previously introduced TODO....