so, fixed another TODO :-)