Looks like there is only 1 remaining call of this method and doesn't consume the boolean. Take care of the TODO?