Better re-positioning after reformatting