Fixing Pip bug 5