Fixed B1 form save