Corrects bug #87.