Implement suggestion by @gecampbell in #56