Potential fix for issue #1618