Re #6485 The last of the P's
Re #6485 better fix this time