NUM-144: Made an implicit TODO explicit