made matching more strict