working in issue #19