bug fix for issue #19