Merge pull request #313 from lowjoel/fix-311
Fixes #311.

(main@aaf7953ac93be81b74b16dcd61094622b7fcb584)