Avoid partial reformatting?