Fixed a problem with matching function boolean logic.