Update to include #167

Add-on to #169