Fixed zpp (again)