Fix Recovery: align_buffer