Fix Piste after refactoring