maybe test the return value of finish here ?