Fix for issue #532.