Add @jlipps code from #415