Improve behavior move pipzap when pip is not enabled

Thanks Dima73