PERI-6 fixed build