OrderViewModel fix