fix for issue #835