Fix for bug #962.