Attempted fix for issue #1676