- Fix valid function from first call