Make finish better

Change-Id: I79ca8090bc0c736097ae761ea05bf81458a7db9c