Trying to fix weird issue noted on TODO