[F] fix ordering issue