improve @tmacdong's commit