one more fix for issue #19