Fix for match list