fixing overwritten changes