Fixed restore behaviour