polish the finite case up