Fix issue #268 and add test.