Minor modify