Another attempt at fixing pin save