Commerce orders fix