Potential fix for issue #1608