Type matcher bugfixed