Addressed a trivial TODO in the code