Experimental patch for #12 (might not work with inlines)