Fix hot restart