Add fix for the form demo related to issue #3