Fix for Order demo model