Fixed another issue caught by validator