Fixed saving data