fix for issue #1061