Fix formOfOrder