[ROP-6] Correct PUF handling