Added workaround for form bug.