Fix for issue #1154.