Yes this is the correct form. See eq (3.72) page 83.