patch plugin to preceed keys with '@' symbol (submitted upstream)