Fixed bug with 2 players
merge Order with fix