We do need to change this logic to make UI nicer.