Edit form fix