Fixed #93
Group by order issue fixed
Test fix