Fix for last commit - now formValues is accessible locally