fix .s and .p