Fix save method