Fix for issue #532.

Fixes issue #532.