Fixing Pip bug 4