fix issue #19