fixed support for {{&