fix for match == None