Completed TODO because of appropriate issue fix