Basic support for #87