solved issue #19