Fix for issue #1068