Fixed bug in day/month order