form fix (#1800)