fix for issue #1926