*8621* Fix forms; assign by reference