Fix issue #21