potential fix for issue #1322