Got rid of smart match operator