fixing up expression matching