Tests passing again for issue #81 patch