Corrects bug #18