Fix match all methods