Fix for issue #1098 to branch 1.4