Fixed deprecated match call