Fix for #7 hopefully.