Fixed getFormValues