Finish what Sape started by fixing the .P2 macro. - Pietro