Fix NewPiste after refactoring