Potential fix for issue #1621