Bug regarding function matching fixed