updates to #3020

Also: adds a test!

For some reason `rake docs:build` is failing…?