Fix prefix generation