Add small enhance to better UX.