fix for issue #19