Support for github/janky#148