Fixed matching bug