New attempt at issue #13

Still doesn't work, though