Fixed another issue found in review