Corrects bug #1