Found bug and added TODO comment