Fix and fixture for issue #16