Fix issue #19