Fix and test for issue #11