Really fixed version for generated p2