Fix for issue #1159.