fixed p6 and p7