Format after #1135