Fixed align_shape_with_bb