Work around new restrictions on @ patterns