#15 fix for match sorting