Fix for issue #1100.