Fix issue #16