issue #19 by Victor