Fix for issue #64.