Fix placement of finish call