Fix regression while packaging