Fix to form reset issues. #40!