Fix for has_matcheverything, has_matchnothing