Fix for #560
Fix failing doc test
Fix for #560